From: Matthew Leeds <matthew.leeds@endlessm.com>
Date: Wed, 6 Jun 2018 20:41:37 +0000 (-0700)
Subject: Fix building against old glib versions
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~197^2~1^2~2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6ea21696a3373d32ea759a794c9673075539e7c4;p=ostree.git

Fix building against old glib versions

We need to include libglnx.h in places where ostree-autocleanups.h is
included, so that we get backports of G_DEFINE_AUTOPTR_CLEANUP_FUNC and
friends.

Closes: #1615
Approved by: jlebon
---

diff --git a/src/libostree/ostree-repo-finder-avahi-parser.c b/src/libostree/ostree-repo-finder-avahi-parser.c
index 0ca8253f..afc9790c 100644
--- a/src/libostree/ostree-repo-finder-avahi-parser.c
+++ b/src/libostree/ostree-repo-finder-avahi-parser.c
@@ -29,6 +29,7 @@
 #include <avahi-common/strlst.h>
 #include <glib.h>
 #include <glib-object.h>
+#include <libglnx.h>
 #include <string.h>
 
 #include "ostree-autocleanups.h"
diff --git a/src/libostree/ostree-repo-finder-avahi.c b/src/libostree/ostree-repo-finder-avahi.c
index e48b60f4..223d8f0a 100644
--- a/src/libostree/ostree-repo-finder-avahi.c
+++ b/src/libostree/ostree-repo-finder-avahi.c
@@ -43,6 +43,7 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib-object.h>
+#include <libglnx.h>
 
 #include "ostree-autocleanups.h"
 #include "ostree-repo-finder.h"
diff --git a/src/libostree/ostree-repo-finder.c b/src/libostree/ostree-repo-finder.c
index 32407ff5..ed44ddca 100644
--- a/src/libostree/ostree-repo-finder.c
+++ b/src/libostree/ostree-repo-finder.c
@@ -27,6 +27,7 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib-object.h>
+#include <libglnx.h>
 
 #include "ostree-autocleanups.h"
 #include "ostree-core.h"
diff --git a/tests/repo-finder-mount.c b/tests/repo-finder-mount.c
index be0e87e3..2cb1d230 100644
--- a/tests/repo-finder-mount.c
+++ b/tests/repo-finder-mount.c
@@ -27,6 +27,7 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib-object.h>
+#include <libglnx.h>
 #include <locale.h>
 
 #include "ostree-autocleanups.h"